Fixing navbar and application navigation

Fixing an issue with the application view that was causing issues with
the navbar links (User stories 1, 4, and 12)