layout overhaul
Merge pull request #16 from btfou/master

layout overhaul