Change layouts a bit more
Merge pull request #3 from alfredxing/master

Fix layouts a bit more