Update to Nav Bar and connecting pages together

We may blow this away later, as the project progresses