First commit
Add some layouting