Nav changes

fixes #117 and applies the navigation to all screens