Fixed inconsistencies on navigation and removed initial active menu item