Fix #229
Merge pull request #231 from ZeusWPI/fix/229/fix-small-layout-issues

Fix #229