Refactor ui because of new popup menu