reverted to a working layout
resolved a merge conflict, please god let this be the last one
Merge pull request #39 from obeid/release-1

layout working now