Improved navigation

Can now switch between views and pages separately