refactor UI, remove some unused imports