Made a bunch of aesthetic improvements