improved layout