More navbar and layout fixes