Layout adjustments

Color & layout
Merge branch 'master' of https://github.com/neppie/ChatStrap.git