improved layout a bit