Fix navigation on screens wider than 400px
Fix navigation on smallest of screens
Merge branch '1832-navigation'