Merge pull request #11 from cdcueva/setup_layout

Setup layout
Merge branch 'master' of https://github.com/cdcueva/oliwi into setup_layout