Work on layout.
Merge pull request #1 from btfou/master

Work on layout.