small design updates
Merge branch 'master' of https://github.com/The-Wildfyre-Group/maureen