Feature/styling

Various styling changes.  `develop` needs to be merged into this before `feature/styling` can be properly viewed on a server.