Layout update.
Merge pull request #25 from CHAOS-Community/master

Layout update.