diff --git a/hackatonApp/www/home-categories.json b/hackatonApp/www/home-categories.json
index 9cfd578..068778d 100644
--- a/hackatonApp/www/home-categories.json
+++ b/hackatonApp/www/home-categories.json
@@ -47,29 +47,41 @@
 		"image":"img/Present.png",
 		"home_sources":[
 			{
-				"id":"McDonald",
-				"title":"McDonald",
-				"description":"Sconto di 2 euro sul BigMac.",
-				"image":"img/mcdonaldlogo.png"
+				"id":"Emozione3",
+				"title":"Pacchetto Emozione3",
+				"description":"20% di sconto sul cofanetto regalo Avventura",
+				"image":"img/promozioni/emozione.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":"Chagall",
+				"title":"Mostra di Chagall",
+				"description":"Biglietto scontato del 10%",
+				"image":"img/promozioni/chagall.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":"Fiorentina",
+				"title":"Fiorentina Calcio",
+				"description":"Vieni a vedere la Viola allo stadio! Il biglietto ti costa solo 10€ e ti offriamo la birra",
+				"image":"img/promozioni/fiorentina.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":"NaturaSi",
+				"title":"NaturaSi",
+				"description":"3 confezioni di ragù Alce Nero per te!",
+				"image":"img/promozioni/naturasi.png"
+			},
+			{
+				"id":"Comisc",
+				"title":"Lucca Comics And Games",
+				"description":"Sconto del 15% sul prezzo del biglietto",
+				"image":"img/promozioni/comics.png"
+			},
+			{
+				"id":"Trenitalia",
+				"title":"Trenitalia",
+				"description":"Biglietto per tratta regionale - 15% di sconto!",
+				"image":"img/promozioni/trenitalia.png"
 			}
 		]
 	},
@@ -77,5 +89,15 @@
 		"id":"settings",
 		"title":"Impostazioni",
 		"image":"img/Settings.png"
+	},
+	{
+		"id":"allTickets",
+		"title":"Tutti I Biglietti",
+		"image":""
+	},
+	{
+		"id":"allShop",
+		"title":"Tutti Gli Acquisti",
+		"image":""
 	}
 ]
diff --git a/hackatonApp/www/img/promozioni/chagall.png b/hackatonApp/www/img/promozioni/chagall.png
new file mode 100644
index 0000000..28eb5b1
Binary files /dev/null and b/hackatonApp/www/img/promozioni/chagall.png differ
diff --git a/hackatonApp/www/img/promozioni/comics.png b/hackatonApp/www/img/promozioni/comics.png
new file mode 100644
index 0000000..50e4294
Binary files /dev/null and b/hackatonApp/www/img/promozioni/comics.png differ
diff --git a/hackatonApp/www/img/promozioni/emozione.png b/hackatonApp/www/img/promozioni/emozione.png
new file mode 100644
index 0000000..766fd07
Binary files /dev/null and b/hackatonApp/www/img/promozioni/emozione.png differ
diff --git a/hackatonApp/www/img/promozioni/fiorentina.png b/hackatonApp/www/img/promozioni/fiorentina.png
new file mode 100644
index 0000000..fd02def
Binary files /dev/null and b/hackatonApp/www/img/promozioni/fiorentina.png differ
diff --git a/hackatonApp/www/img/promozioni/mcdonalds.png b/hackatonApp/www/img/promozioni/mcdonalds.png
new file mode 100644
index 0000000..fa3c552
Binary files /dev/null and b/hackatonApp/www/img/promozioni/mcdonalds.png differ
diff --git a/hackatonApp/www/img/promozioni/naturasi.png b/hackatonApp/www/img/promozioni/naturasi.png
new file mode 100644
index 0000000..210e6c8
Binary files /dev/null and b/hackatonApp/www/img/promozioni/naturasi.png differ
diff --git a/hackatonApp/www/img/promozioni/trenitalia.png b/hackatonApp/www/img/promozioni/trenitalia.png
new file mode 100644
index 0000000..31860f1
Binary files /dev/null and b/hackatonApp/www/img/promozioni/trenitalia.png differ
diff --git a/hackatonApp/www/img/sfondoSettings.png b/hackatonApp/www/img/sfondoSettings.png
new file mode 100644
index 0000000..66a7bd8
Binary files /dev/null and b/hackatonApp/www/img/sfondoSettings.png differ
diff --git a/hackatonApp/www/img/splashBackground.jpg b/hackatonApp/www/img/splashBackground.jpg
new file mode 100644
index 0000000..0e7a83b
Binary files /dev/null and b/hackatonApp/www/img/splashBackground.jpg differ
diff --git a/hackatonApp/www/js/app.js b/hackatonApp/www/js/app.js
index 4fbf597..0ef3bd8 100644
--- a/hackatonApp/www/js/app.js
+++ b/hackatonApp/www/js/app.js
@@ -269,12 +269,22 @@ angular.module('your_app_name', [
     }
   })
 
-  .state('app.allTickets', {
-    url: "/allTickets",
+  .state('app.alltickets', {
+    url: "/alltickets",
     views: {
       'menuContent': {
         templateUrl: "views/app/allTickets.html",
-        controller: 'AllTicketsCtrl'
+        controller: 'CategoryCtrl'
+      }
+    }
+  })
+
+  .state('app.allshop', {
+    url: "/allshop",
+    views: {
+      'menuContent': {
+        templateUrl: "views/app/allTickets.html",
+        controller: 'CategoryCtrl'
       }
     }
   })
diff --git a/hackatonApp/www/js/controllers.js b/hackatonApp/www/js/controllers.js
index 7156f0d..3b4e55f 100644
--- a/hackatonApp/www/js/controllers.js
+++ b/hackatonApp/www/js/controllers.js
@@ -544,6 +544,9 @@ angular.module('your_app_name.controllers', [])
 })
 .controller('AllTicketsCtrl', function($scope, $http) {
 })
+
+.controller('AllShopCtrl', function($scope, $http) {
+})
 .controller('HomeCtrl', function($scope, $http) {
 
 	$scope.home_categories = [];
@@ -559,7 +562,12 @@ angular.module('your_app_name.controllers', [])
 
 	$scope.categoryId = $stateParams.categoryId;
 	console.log($scope.categoryId);
-
+	$scope.modifica=false;
+	$scope.cambiaModifica = function()
+	{
+		$scope.modifica=!$scope.modifica;
+		
+	}
 	switch($scope.categoryId)
 	{
 		case "addticketwithphoto":
@@ -591,6 +599,16 @@ angular.module('your_app_name.controllers', [])
 			console.log("odod");
 			break;
 		}
+		case "alltickets":
+		{
+			$scope.categoryTitle = "Tutti I Biglietti";
+			break;
+		}
+		case "allshop":
+		{
+			$scope.categoryTitle = "Tutti Gli Acquisti";
+			break;
+		}
 	}
 	
 	
diff --git a/hackatonApp/www/views/app/category.html b/hackatonApp/www/views/app/category.html
index 9ec0d1f..c166cc8 100644
--- a/hackatonApp/www/views/app/category.html
+++ b/hackatonApp/www/views/app/category.html
@@ -1,4 +1,4 @@
-<ion-view class="">
+<ion-view class="" ng-hide="categoryId==settings'">
   <ion-nav-title>
     <span>{{categoryTitle}}</span>
   </ion-nav-title>
@@ -34,26 +34,54 @@
           <img ng-src="{{cameraPic}}"/>
     </div>     
 
-    
 
-    <div class="top-content row" ng-show="categoryId=='settings'">
+  </ion-content>
+</ion-view>
+<ion-view class="profile-view" ng-show="categoryId=='settings'">
+  <ion-content>
+    <div class="top-content row">
       <div class="profile-container">
         <div class="user-image-container">
           <pre-img ratio="_1_1" helper-class="rounded-image">
-            <img class="user-image" ng-src="https://s3.amazonaws.com/uifaces/faces/twitter/brynn/128.jpg" spinner-on-load>
+            <img class="user-image" ng-src="{{user.picture}}" spinner-on-load>
           </pre-img>
         </div>
-        <div class="user-name">Brynn Evans</div>
-        <div class="user-twitter">@brynn</div>
+        <div class="user-name">{{user.name}} {{user.surname}}</div>
       </div>
       <div class="user-background-image-outer">
-        <div multi-bg="['https://s3.amazonaws.com/uifaces/faces/twitter/brynn/128.jpg']"></div>
+        <div multi-bg="['img/sfondoSettings.png']"></div>
       </div>
     </div>
     <div class="bottom-content">
-      <div class="user-bio">
-        <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.</p>
+      <div class="list">
+        <label class="item item-input item-floating-label">
+          <span class="input-label">Nome</span>
+          <input type="text" placeholder="Nome" value="Laura" ng-disabled="modifica">
+        </label>
+        <label class="item item-input item-floating-label">
+          <span class="input-label">Cognome</span>
+          <input type="text" placeholder="Cognome" value="Rossi" ng-disabled="modifica">
+        </label>
+        <label class="item item-input item-floating-label">
+          <span class="input-label">Email</span>
+          <input type="email" placeholder="Email" value="laura.rossi@email.it" ng-disabled="modifica">
+        </label>
+        <label class="item item-input item-floating-label">
+          <span class="input-label">Cellulare</span>
+          <input type="text" placeholder="Cellulare" value="3477608470" ng-disabled="modifica">
+        </label>
+        <label class="item item-input item-floating-label">
+          <span class="input-label">Password</span>
+          <input type="password" placeholder="Password" value="passworddifficilissima" ng-disabled="modifica">
+        </label>
+         <button  class="button button-positive-right" style="float:right; border:0;" ng-click="cambiaModifica();">
+            <i ng-show='!modifica' class="icon ion-edit"></i>
+            <i ng-show='modifica' class="icon ion-checkmark-round">Salva </i>
+          </button>
       </div>
     </div>
   </ion-content>
 </ion-view>
+
+
+gfgr
\ No newline at end of file
diff --git a/hackatonApp/www/views/app/settings.html b/hackatonApp/www/views/app/settings.html
index 6be2cce..e69de29 100644
--- a/hackatonApp/www/views/app/settings.html
+++ b/hackatonApp/www/views/app/settings.html
@@ -1,50 +0,0 @@
-<ion-view class="settings-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>fvvv</span>
-  </ion-nav-title>
-  <ion-content>
-    <ul class="list">
-
-      <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/side-menu.html b/hackatonApp/www/views/app/side-menu.html
index 922a8b8..33d9f8f 100644
--- a/hackatonApp/www/views/app/side-menu.html
+++ b/hackatonApp/www/views/app/side-menu.html
@@ -20,13 +20,13 @@
           <h2 class="greeting">Ciao {{user.name}}.</h2>
           <p class="message">Bentornata!</p>
         </ion-item>
-        <ion-item class="item-icon-left" menu-close ui-sref="app.allTickets">
+        <ion-item class="item-icon-left" menu-close ui-sref="app.alltickets">
           <i class="icon ion-pricetags"></i>
-          <h2 class="menu-text">Tutti i biglietti</h2>
+          <h2 class="menu-text">Tutti i biglietti!</h2>
         </ion-item>
-        <ion-item class="item-icon-left" menu-close ui-sref="app.settings">
-          <i class="icon ion-gear-a"></i>
-          <h2 class="menu-text">Impostazioni</h2>
+         <ion-item class="item-icon-left" menu-close ui-sref="app.allshop">
+          <i class="icon ion-bag"></i>
+          <h2 class="menu-text">I tuoi acquisti!</h2>
         </ion-item>
         <ion-item class="item-icon-left"  menu-close ui-sref="#">
           <i class="icon ion-power"></i>
diff --git a/hackatonApp/www/views/auth/auth.html b/hackatonApp/www/views/auth/auth.html
index 4c695d4..5519e2d 100644
--- a/hackatonApp/www/views/auth/auth.html
+++ b/hackatonApp/www/views/auth/auth.html
@@ -1,4 +1,4 @@
 <ion-nav-view class="auth-outer">
-	<div multi-bg="['img/bg-gif.gif']"></div>
+	<div multi-bg="['img/splashBackground.jpg']"></div>
 	<!-- <div multi-bg="['img/bg-img.jpg']"></div> -->
 </ion-nav-view>