+ improved layout