[MR,CT]{issue} I12 - Changes because of usability tests.