Fixed layout to accurately reflect original design