somewhat improved layout