Resolve some sizing issues
Merge branch 'Issue-#251' into stage