Rearranged navigation, fixed routing bug.

The JS in the sidebar didnt behave correctly, aint nobody got time to
fix that.