a bit improved layout