finished initial ui refactoring