478 + layout fix
Merge pull request #44 from stumbler/master

478 + layout fix