diff --git a/js/MapEditor.js b/js/MapEditor.js
diff --git a/js/angular/controllers/mainController.js b/js/angular/controllers/mainController.js
@@ -3,28 +3,6 @@
 
     var mainController = ['$scope', '$location', 'pageUrlService', function($scope, $location, pageUrlService) {
 
-        $scope.getCurrentSubPageName = function() {
-            var page = pageUrlService.getPageName();
-
-            if (page === 'bio' || page === 'cv' || page === 'blog' || page === 'art' || page === 'videos' || page === 'photos') {
-                return page;
-            } else {
-                return 'NONE';
-            }
-        }
-
-        $scope.getCurrentMainPage = function() {
-            var page = pageUrlService.getPageName();
-            if (page === 'start' || page === 'profile' || page === 'projects' || page === 'misc') {
-                return page;
-            } else if (page === 'bio' || page === 'cv') {
-                return 'profile';
-            } else if (page === 'blog' || page === 'art' || page === 'videos' || page === 'photos') {
-                return 'misc';
-            } else {
-                return 'NONE';
-            }
-        }
     }];
 
     app.controller("mainController", mainController);

diff --git a/js/angular/controllers/projectsController.js b/js/angular/controllers/projectsController.js
@@ -6,62 +6,62 @@
 
         var projects = [{
             'id': 'starapp',
-            'img': '../img/build//starapp.png',
+            'img': '../img/build/starapp.png',
             'name': 'Star Manager',
             'description': 'A Starcraft 2 app for Windows 8/RT'
         }, {
             'id': 'portfolio',
-            'img': '../img/build//portfolio.png',
+            'img': '../img/build/portfolio.png',
             'name': 'Portfolio',
             'description': 'My portfolio and personal website'
         }, {
             'id': 'sti',
-            'img': '../img/build//sti.png',
+            'img': '../img/build/sti.png',
             'name': 'sti-starcraft',
             'description': 'A Starcraft 2 community'
         }, {
             'id': 'exjobb',
-            'img': '../img/build//exjobb.png',
+            'img': '../img/build/exjobb.png',
             'name': 'Bachelors thesis',
             'description': 'My Bachelors Thesis from my time at Chalmers'
         }, {
             'id': 'instaanalytics',
-            'img': '../img/build//instaanalytics.png',
+            'img': '../img/build/instaanalytics.png',
             'name': 'Instagram Analyzer',
             'description': 'An app used for analyzing an Instagram account'
         }, {
             'id': 'wcc',
-            'img': '../img/build//wcc.png',
+            'img': '../img/build/wcc.png',
             'name': 'World Cup Calculator',
             'description': 'A calculator used to simulate potential World cup 2014 results'
         }, {
             'id': 'snake',
-            'img': '../img/build//snake.png',
+            'img': '../img/build/snake.png',
             'name': 'GyroSnake',
             'description': 'A Snake game for Android devices'
         }, {
             'id': 'flappyDoge',
-            'img': '../img/build//flappyDoge.png',
+            'img': '../img/build/flappyDoge.png',
             'name': 'FlappyDoge',
             'description': 'My version of the popular game Flappy Bird'
         }, {
             'id': 'mkp',
-            'img': '../img/build//mkp.png',
+            'img': '../img/build/mkp.png',
             'name': 'Mobile Keyring',
             'description': 'A technology used for generating temporary passwords'
         }, {
             'id': 'arduinorobot',
-            'img': '../img/build//arduinoRobot.png',
+            'img': '../img/build/arduinoRobot.png',
             'name': 'Arduino Robot',
             'description': 'A robot built with the Arduino microcontroller unit'
         }, {
             'id': 'wh40k',
-            'img': '../img/build//wh40k.png',
+            'img': '../img/build/wh40k.png',
             'name': 'Warhammer 40k Simulator',
             'description': 'A game engine based on the popular boardgame Warhammer 40k'
         }, {
             'id': 'flickrEditor',
-            'img': '../img/build//flickrEditor.png',
+            'img': '../img/build/flickrEditor.png',
             'name': 'Flickr Editor',
             'description': 'A simple image editor based on Flickrs API'
         }];

diff --git a/js/angular/services/pageUrlService.js b/js/angular/services/pageUrlService.js
@@ -28,7 +28,6 @@
         }
 
         return {
-            getPageName: getPageName,
             getCurrentMainPage: getCurrentMainPage
         };
     }];

diff --git a/js/libs/snowstorm-min.js b/js/libs/snowstorm-min.js
diff --git a/json/videos.json b/json/videos.json
@@ -0,0 +1,61 @@
+{
+    "categories": [{
+        "name": "Drawing",
+        "videos": [{
+            "name": "Lizard - Speed drawing",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=7x2UNZJR6CE"
+        }, {
+            "name": "Lizard monster drawing",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=BZlBThdalQk"
+        }, {
+            "name": "Tiger speed drawing",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=3tXxkPJKhaY"
+        }]
+    }, {
+        "name": "Gaming",
+        "videos": [{
+            "name": "Fifa 15 2v2 - LOL moments",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=FtmTcA0xq8M"
+        }, {
+            "name": "Fifa 15 - 2v2 - BubonicBrain & T0Weli3 - Best goals",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=XkxLlN35xs8"
+        }, {
+            "name": "ToWelie - Battlefield 4 montage",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=HScxsJkpf_8"
+        }, {
+            "name": "ToWelieSTI ladder highlights - StarCraft 2 - Part 3",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=_ofEb2kekYI"
+        }, {
+            "name": "ToWelieSTI ladder highlights - StarCraft 2 - Part 2",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=L27_NCeNaQ8"
+        }, {
+            "name": "ToWelieSTI ladder highlights - StarCraft 2 - Part 1",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=yQMLZaJYBvI"
+        }, {
+            "name": "Call of Duty: Modern Warfare 2 - TGF Frag montage",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=Bm1-emdG6dA"
+        }, {
+            "name": "Call of Duty: Modern Warfare 2 - Sniping Skillz - [TGF]",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=j0shh6_YY2g"
+        }, {
+            "name": "ToWelieSTI ladder highlights - StarCraft 2 - Part 2",
+            "description": "",
+            "url": "https://www.youtube.com/watch?v=L27_NCeNaQ8"
+        }, {
+            "name": "MFWA - Karazhan encounters",
+            "description": "A very old WoW-video I made with some footage from our guild MFWA raiding Karazhan back in the Burning Crusade days.",
+            "url": "https://www.youtube.com/watch?v=VfiP9KyfjmU"
+        }]
+    }]
+}