layout before overhaul