navbar went on a diet
merge fix