Added navigation and restructured the app a little