new layout and new area buttons
Merge pull request #446 from gogolander/test

new layout and new area buttons