Small style tweaks and the start of content refactoring