added some navigation and routing