Merge changes ui elem

merge request for all new ui elem