Revert "Merge pull request #267 from BeshoSmile/final_layout"

This reverts commit 0d59850321551b794d7ee65c0b0fa8ec8809e92b, reversing
changes made to 6870649195d987cd4d670c577718ad7528bd8812.