Made changes to the UI mapping. Works with ve-sprint-11