Redo layout
Merge pull request #5 from atom-morgan/edit-main-layout

Redo layout