Added Navigation Stuff
Modularising