added some layout
Improved layout
Blah Automerge...