Clean up css some more, shaved off about 1kB
Reorganize scss into partials