Fixed some layout issues.
Merge origin/master