[#11] Better layout added

- Still need to polish, comment and add tests, but it works