Revised layouts