diff --git a/styleguide/404.html b/styleguide/404.html
index d6b3996a6..2f8787df8 100644
--- a/styleguide/404.html
+++ b/styleguide/404.html
@@ -3,13 +3,14 @@
 <head>
 	<meta charset="utf-8">
 	<title>Acpaas UI | Angular Modules</title>
+	<link rel="icon" type="image/x-icon" href="favicon.ico">
 	<script>
 		// Store the URL the user was trying to access when receiving the 404.
 		sessionStorage.redirect = location.href;
 	</script>
 
 	<!-- Immediately redirect to the base URL so we can use the SPA routing. -->
-	<meta http-equiv="refresh" content="0;URL='/'"></meta>
+	<meta http-equiv="refresh" content="0;URL='/acpaas-ui_angular'"></meta>
 </head>
 <body>
 	<!-- IE required at least 512 bytes of data to show non-default 404. -->
diff --git a/styleguide/app/routes.ts b/styleguide/app/routes.ts
index a737df23c..cfdf92d53 100644
--- a/styleguide/app/routes.ts
+++ b/styleguide/app/routes.ts
@@ -4,7 +4,7 @@ import { NotFoundPageComponent } from './pages/not-found/not-found.page';
 
 export const ROUTES: Routes = [
 	{
-		path: '', redirectTo: '/modules/avatar', pathMatch: 'full',
+		path: '', redirectTo: '/modules/analytics', pathMatch: 'full',
 	},
 	{
 		path: 'not-found', component: NotFoundPageComponent,
diff --git a/styleguide/index.html b/styleguide/index.html
index 18be93718..cd01a84f6 100644
--- a/styleguide/index.html
+++ b/styleguide/index.html
@@ -32,6 +32,7 @@
 
 	<guide-root></guide-root>
 
+	<!-- In order to make the GitHub Pages hack work (see above), make sure it loads before all other scripts -->
 	<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.10.0/highlight.min.js"></script>
 	<script src="https://cdn.ckeditor.com/4.6.2/standard/ckeditor.js"></script>
 </body>
