More aesthetic improvements

Also a bit of content