Layout fixes and improvements
Merge pull request #3 from xfh/develop

Layout fixes and improvements