Tweak editor vertical margin
Fix sidebar expand/collapse regression
Add a few more special cases cases