Corrected/cleaned up layout to proper sizes and locations.
Merge branch 'newLayout'