refactor, changed ui