Fixed layout issues.
Merge pull request #415 from e-cuellar/master

Fixed layout issues