Corrected/cleaned up layout to proper sizes and locations.