reorganise all the pages and update the navigation in preparation for full set of reports