Cleaned up the nav and general flow of the app.