- improved layout