Major layout overhaul