done on ui changes
Finish hotfix-2