diff --git a/optimize.sh b/optimize.sh
index 707dc0b..7016792 100755
--- a/optimize.sh
+++ b/optimize.sh
@@ -5,10 +5,11 @@ set -e
 js="elm.js"
 min="elm.min.js"
 
-elm make --optimize --output=$js "$@"
+elm make --debug --output=$js "$@"
+# elm make --optimize --debug --output=$js "$@"
 
 uglifyjs $js --compress 'pure_funcs=[F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9],pure_getters,keep_fargs=false,unsafe_comps,unsafe' | uglifyjs --mangle --output $min
 
 echo "Compiled size:$(wc $js -c) bytes  ($js)"
 echo "Minified size:$(wc $min -c) bytes  ($min)"
-echo "Gzipped size: $(gzip $min -c | wc -c) bytes"
\ No newline at end of file
+echo "Gzipped size: $(gzip $min -c | wc -c) bytes"
diff --git a/src/Header.elm b/src/Header.elm
index 4cf08f8..9f62398 100644
--- a/src/Header.elm
+++ b/src/Header.elm
@@ -22,15 +22,17 @@ view model =
             blur = 5,
             color = Element.rgba 0 0 0 0.15
             }
-        headerButton msg string =
-            Element.el
-                [Element.alignRight, Element.Events.onClick <| msg]
-                (Element.text string)
+        headerButton string =
+            Element.link
+                [Element.alignRight]
+                { url = "/" ++ string
+                , label = Element.text string
+                }
 
-        products  = headerButton ClickedProducts "Products"
-        resources = headerButton ClickedResources "Resources"
-        about     = headerButton ClickedAbout "About"
-        contact   = headerButton ClickedContact "Contact"
+        products  = headerButton "Products"
+        resources = headerButton "Resources"
+        about     = headerButton "About"
+        contact   = headerButton "Contact"
     in
     Element.row [Element.width Element.fill,
                  Element.spacing 15,
diff --git a/src/Main.elm b/src/Main.elm
index 89a95c0..d35bd76 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -63,7 +63,7 @@ type Msg
     | Header Header.Msg
     | LandingPage Page.Landing.Msg
     | UrlChanged Url.Url
-    | LinkedClicked Browser.UrlRequest
+    | UrlRequest Browser.UrlRequest
 
 
 update : Msg -> Model -> (Model, Cmd Msg)
@@ -75,6 +75,8 @@ update msg model =
                 newModel = { model | page = toPage headerMsg }
             in
                 (newModel, Browser.Navigation.pushUrl model.key (Url.toString newUrl))
+        UrlChanged url ->
+                (model, Browser.Navigation.pushUrl model.key (Url.toString url))
         _ -> (model, Cmd.none)
 
 subscriptions : Model -> Sub Msg
@@ -118,5 +120,5 @@ main =
        ,update = update
        ,subscriptions = subscriptions
        ,onUrlChange = UrlChanged
-       ,onUrlRequest = LinkedClicked
+       ,onUrlRequest = UrlRequest
        }