CH-93 - Updated overall layout to be fixed entirely