Fix the layout of navigation

Add small amendments in Layout and CSS