Add a variable for navigation
Reorganise layout and nav