Reverse last commit re spacing

.. not because it was a bad idea, it is a great idea.

.. we need to replace the tabbar with a scopebar and
   customise it for the view menu and support scrolling
   left and right.

.. will sort this weekend