Tidying up includes and thinking about where to put page navigation