updates to refactor UI