four little styling bugs
Merge branch 'develop' into tvw