Updated to improve tab grouping and spacing

Adjusted tabs to better match Notable high fidelity mockup, have
started playing with DIV and CSS layout to better have layout.