Add UI + refactorin