layout overhaul