working out the new layout