back to proper layout
Merge pull request #129 from gregorybesson/develop

back to proper layout