Lots of small fixes and stylesheet tweaks