Aesthetics and Focus

Covers most of #27 but dot not entirely fix it