Fixed some layout issues
Merge pull request #14 from piaw/master

Fixed some layout issues