Fix collapsed top menu (missing "data-topbar" attribute :$), restore top menu (was very fiddly to navigate around without it), switch theme to SCSS (propagated from trunk).
Revert restore top menu