Restructure main navigation

I completely restructure the main navigation because the old structure
wasn't very obvious.