Minor layout and nav menu fixes