many various fixes to nav bar and layout