Feature/pretty

Merging all my mild polishing from feature/pretty into feature/04--shake-it-off. 

The slight appearance mods should already be in the master branch.