Lots of small changes to styles and templates. #1 #2