mayor layout overhaul