Updated to reverse layout