diff --git a/hackatonApp/scss/home-items.scss b/hackatonApp/scss/home-items.scss
index 73521cb..b663a3c 100644
--- a/hackatonApp/scss/home-items.scss
+++ b/hackatonApp/scss/home-items.scss
@@ -180,3 +180,10 @@ $pre-img-ratios: append($pre-img-ratios, $home-categories-img-ratio);
 		}
 	}
 }
+input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"] {
+    border: 10px;
+    margin-top: 10px;
+    margin-left: 10px;
+    margin-bottom: 10px;
+    font-size: 20px;
+}
\ No newline at end of file
diff --git a/hackatonApp/www/home-categories.json b/hackatonApp/www/home-categories.json
index 4ae532c..da43340 100644
--- a/hackatonApp/www/home-categories.json
+++ b/hackatonApp/www/home-categories.json
@@ -7,47 +7,69 @@
 			{
 				"id":"Trenitalia",
 				"title":"Trenitalia",
-				"description":"The latest stories from the World section of the BBC News web site.",
-				"image":"img/trenitalialogo.png",
-				"url":"http://feeds.bbci.co.uk/news/world/rss.xml"
-				
+				"description":"",
+				"image":"img/trenitalialogo.png"
 			},
 			{
 				"id":"Trenitalia",
 				"title":"Trenitalia",
-				"description":"Reuters.com is your source for breaking news, business, financial and investing news, including personal finance and stocks. Reuters is the leading global provider of news, financial information and technology solutions to the world's media, financial institutions, businesses and individuals.",
-				"image":"img/trenitalialogo.png",
-				"url":"http://feeds.reuters.com/Reuters/worldNews"
+				"description":"",
+				"image":"img/trenitalialogo.png"
 			},
 			{
 				"id":"Trenitalia",
 				"title":"Trenitalia",
-				"description":"CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.",
-				"image":"img/trenitalialogo.png",
-				"url":"http://rss.cnn.com/rss/cnn_world.rss"
+				"description":"",
+				"image":"img/trenitalialogo.png"
 			},
 			{
 				"id":"Trenitalia",
 				"title":"Trenitalia",
-				"description":"Latest World news, comment and analysis from the Guardian, the world's leading liberal voice",
-				"image":"img/trenitalialogo.png",
-				"url":"http://www.theguardian.com/world/rss"
+				"description":"",
+				"image":"img/trenitalialogo.png"
 			}
 		]
 	},
 	{
 		"id":"addticketwithphoto",
 		"title":"Aggiungi un biglietto",
-		"image":"img/feeds/sports.jpg"
+		"image":"img/Camera.png"
 	},
 	{
 		"id":"shop",
 		"title":"Spendi i crediti",
-		"image":"img/feeds/business.jpg"
+		"image":"img/Cart.png",
+		"home_sources":[
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"Sconto di 2 euro sul BigMac.",
+				"image":"img/mcdonaldlogo.png"
+				
+			},
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"Reuters.com is your source for breaking news, business, financial and investing news, including personal finance and stocks. Reuters is the leading global provider of news, financial information and technology solutions to the world's media, financial institutions, businesses and individuals.",
+				"image":"img/mcdonaldlogo.png"
+			},
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.",
+				"image":"img/mcdonaldlogo.png"
+			},
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"Latest World news, comment and analysis from the Guardian, the world's leading liberal voice",
+				"image":"img/mcdonaldlogo.png"
+			}
+		]
 	},
 	{
-		"id":"ranks",
-		"title":"Classifica",
+		"id":"settings",
+		"title":"Impostazioni",
 		"image":"img/feeds/entertainment.jpg"
 	}
 ]
diff --git a/hackatonApp/www/img/Camera.png b/hackatonApp/www/img/Camera.png
new file mode 100644
index 0000000..d6ab414
Binary files /dev/null and b/hackatonApp/www/img/Camera.png differ
diff --git a/hackatonApp/www/img/Cart.png b/hackatonApp/www/img/Cart.png
new file mode 100644
index 0000000..13bbabb
Binary files /dev/null and b/hackatonApp/www/img/Cart.png differ
diff --git a/hackatonApp/www/img/mcdonaldlogo.png b/hackatonApp/www/img/mcdonaldlogo.png
new file mode 100644
index 0000000..cbeed01
Binary files /dev/null and b/hackatonApp/www/img/mcdonaldlogo.png differ
diff --git a/hackatonApp/www/js/controllers.js b/hackatonApp/www/js/controllers.js
index deb32a6..37f8dd6 100644
--- a/hackatonApp/www/js/controllers.js
+++ b/hackatonApp/www/js/controllers.js
@@ -544,7 +544,6 @@ angular.module('your_app_name.controllers', [])
 	{
 		case "addticketwithphoto":
 		{
-			console.log("ciao");
 			takePicture();
 			break;
 		}
@@ -557,6 +556,21 @@ angular.module('your_app_name.controllers', [])
 			});
 			break;
 		}
+		case "shop":
+		{
+			$http.get('home-categories.json').success(function(response) {
+			var category = _.find(response, {id: $scope.categoryId});
+			$scope.categoryTitle = category.title;
+			$scope.category_sources = category.home_sources;
+			});
+			break;
+		}
+		case "settings":
+		{
+			$scope.categoryTitle = "Impostazioni";
+			console.log("odod");
+			break;
+		}
 	}
 	
 	
diff --git a/hackatonApp/www/shop-categories.json b/hackatonApp/www/shop-categories.json
new file mode 100644
index 0000000..902d9a4
--- /dev/null
+++ b/hackatonApp/www/shop-categories.json
@@ -0,0 +1,75 @@
+[
+	{
+		"id":"booking",
+		"title":"Prenota",
+		"image":"img/feeds/news.jpg",
+		"home_sources":[
+			{
+				"id":"Trenitalia",
+				"title":"Trenitalia",
+				"description":"",
+				"image":"img/trenitalialogo.png"
+			},
+			{
+				"id":"Trenitalia",
+				"title":"Trenitalia",
+				"description":"",
+				"image":"img/trenitalialogo.png"
+			},
+			{
+				"id":"Trenitalia",
+				"title":"Trenitalia",
+				"description":"",
+				"image":"img/trenitalialogo.png"
+			},
+			{
+				"id":"Trenitalia",
+				"title":"Trenitalia",
+				"description":"",
+				"image":"img/trenitalialogo.png"
+			}
+		]
+	},
+	{
+		"id":"addticketwithphoto",
+		"title":"Aggiungi un biglietto",
+		"image":"img/Camera.png"
+	},
+	{
+		"id":"shop",
+		"title":"Spendi i crediti",
+		"image":"img/Cart.png",
+		"home_sources":[
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"Sconto di 2 euro sul BigMac.",
+				"image":"img/mcdonaldlogo.png"
+				
+			},
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"Reuters.com is your source for breaking news, business, financial and investing news, including personal finance and stocks. Reuters is the leading global provider of news, financial information and technology solutions to the world's media, financial institutions, businesses and individuals.",
+				"image":"img/mcdonaldlogo.png"
+			},
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.",
+				"image":"img/mcdonaldlogo.png"
+			},
+			{
+				"id":"McDonald",
+				"title":"McDonald",
+				"description":"Latest World news, comment and analysis from the Guardian, the world's leading liberal voice",
+				"image":"img/mcdonaldlogo.png"
+			}
+		]
+	},
+	{
+		"id":"ranks",
+		"title":"Classifica",
+		"image":"img/feeds/entertainment.jpg"
+	}
+]
diff --git a/hackatonApp/www/views/app/allTickets.html b/hackatonApp/www/views/app/allTickets.html
index 0f33389..e69de29 100644
--- a/hackatonApp/www/views/app/allTickets.html
+++ b/hackatonApp/www/views/app/allTickets.html
@@ -1,38 +0,0 @@
-<ion-view class="bookmarks-view">
- <ion-nav-buttons side="left">
-    <button menu-toggle="left" class="button button-icon icon ion-navicon"></button>
-  </ion-nav-buttons>
-  <ion-nav-title>
-    <span>Bookmarks</span>
-  </ion-nav-title>
-  <ion-content>
-    <div ng-if="(bookmarks.wordpress.length == 0 && bookmarks.feeds.length == 0)" class="row bookmarks-container">
-      <div class="col col-center">
-        <div class="empty-results">
-          <i class="icon ion-bookmark"></i>
-          <h3 class="no-bookmarks">There's nothing here yet. Start exploring!</h3>
-        </div>
-      </div>
-    </div>
-    <ul ng-if="(bookmarks.wordpress.length > 0 || bookmarks.feeds.length > 0)" class="bookmarks-list">
-      <div ng-if="bookmarks.feeds.length > 0" class="item item-divider">
-        Feeds Bookmarks
-      </div>
-      <li class="bookmark-item" ng-repeat="bookmark in bookmarks.feeds">
-        <a ng-click=goToFeedPost(bookmark.link)>
-          <h2 class="post-title" ng-bind-html="bookmark.title | rawHtml"></h2>
-          <p class="post-date">Posted <span class="post-time" am-time-ago="bookmark.date"></span></p>
-        </a>
-      </li>
-      <div ng-if="bookmarks.wordpress.length > 0" class="item item-divider">
-        Wordpress bookmarks
-      </div>
-      <li class="bookmark-item" ng-repeat="bookmark in bookmarks.wordpress">
-        <a ng-click=goToWordpressPost(bookmark.id)>
-          <h2 class="post-title" ng-bind-html="bookmark.title | rawHtml"></h2>
-          <p class="post-date">Posted <span class="post-time" am-time-ago="bookmark.date"></span></p>
-        </a>
-      </li>
-    </ul>
-  </ion-content>
-</ion-view>
diff --git a/hackatonApp/www/views/app/category.html b/hackatonApp/www/views/app/category.html
index 43c3b54..d109f01 100644
--- a/hackatonApp/www/views/app/category.html
+++ b/hackatonApp/www/views/app/category.html
@@ -3,6 +3,10 @@
     <span>{{categoryTitle}}</span>
   </ion-nav-title>
   <ion-content>
+
+    <input type="text" placeholder="Search" ng-hide="categoryId=='settings'">
+         
+
    <div class="list category-homes">
       <a ng-repeat="source in category_sources" class="item item-icon-right" ui-sref="app.category-entries({categoryId: categoryId, sourceId: (source.title | slugify)})">
         <div class="thumbnail-outer" style="height:80px;">
@@ -14,8 +18,51 @@
           <span class="title">{{source.title}}</span>
           <p class="description">{{source.description}}</p>
         </div>
-        <i class="icon ion-arrow-right-c"></i>
+        <i ng-hide="categoryId=='shop'" class="icon ion-arrow-right-c"></i>
+        <i ng-show="categoryId=='shop'" class="icon ion-bag"></i>
+
       </a>
     </div>
+
+    <ul class="list" ng-show="categoryId=='settings'">
+
+      <div class="item item-divider">TOGGLE</div>
+
+      <ion-toggle ng-model="airplaneMode" toggle-class="toggle-assertive">Airplane Mode</ion-toggle>
+      <ion-toggle ng-model="wifi" toggle-class="toggle-positive">Wi-Fi</ion-toggle>
+      <ion-toggle ng-model="bluetooth" toggle-class="toggle-calm">Bluetooth</ion-toggle>
+      <ion-toggle ng-model="personalHotspot" toggle-class="toggle-dark">Personal Hotspot</ion-toggle>
+
+      <div class="item item-divider">CHECKBOXES</div>
+
+      <ion-checkbox ng-model="checkOpt1">Option 1</ion-checkbox>
+      <ion-checkbox ng-model="checkOpt2">Option 2</ion-checkbox>
+      <ion-checkbox ng-model="checkOpt3">Option 3</ion-checkbox>
+
+      <div class="item item-divider">RADIO</div>
+
+      <ion-radio ng-model="radioChoice" ng-value="'A'">Choose A</ion-radio>
+      <ion-radio ng-model="radioChoice" ng-value="'B'">Choose B</ion-radio>
+      <ion-radio ng-model="radioChoice" ng-value="'C'">Choose C</ion-radio>
+
+      <div class="item item-divider">RANGES</div>
+
+      <div class="range">
+        <i class="icon ion-volume-low"></i>
+        <input type="range" name="volume">
+        <i class="icon ion-volume-high"></i>
+      </div>
+      <div class="item range range-positive">
+        <i class="icon ion-ios-sunny-outline"></i>
+        <input type="range" name="volume" min="0" max="100" value="33">
+        <i class="icon ion-ios-sunny"></i>
+      </div>
+
+      <div class="item item-divider"></div>
+
+      <button class="button button-block button-assertive" ng-click="showLogOutMenu()">
+        Logout
+      </button>
+    </ul>
   </ion-content>
 </ion-view>
diff --git a/hackatonApp/www/views/app/home.html b/hackatonApp/www/views/app/home.html
index 5c9e687..71fef7b 100644
--- a/hackatonApp/www/views/app/home.html
+++ b/hackatonApp/www/views/app/home.html
@@ -19,6 +19,7 @@
         <a class="home-category" ui-sref="app.category({categoryId: (category.id | slugify)})">
           <pre-img ratio="_1_1" helper-class="square-image">
             <img class="category-image" ng-src="{{category.image}}" spinner-on-load>
+         
           </pre-img>
           <div class="category-bg"></div>
           <span class="category-title">{{category.title}}</span>