fixing existing UI mapping functionality