much improved layout