Add the ugly temp layout to what we have