changes from UX team part1
merged