major layout overhaul