refactor ui-views