Getting the new layout sorted