improved layout, thanks to Bruce Miller