fixed un-merged items in layout, navbar displays correctly on all pages