Swap in navigation bar

Changes to incorporate navigation bar rather than simple buttons.