made layout better