initial simple layaout setup.
fix merge master conflicts
Merge pull request #11 from cdcueva/setup_layout

Setup layout