new ui, git refactor