Modified the navbar and cleaned up the code.  Added sorting for the menus