minor tweaks and fixes
reorganized navbar