Improved navigation

Added flexibility for more features later, cosmetic stuff.