Layout overhaul