Patch up some layout stuff when zoomed slightly out

Fix #2031 by patching up some layout stuff.

Unfortunately the CSS file got auto reformatted, so apologies there. I'll highlight the relevant changes in comments