completed UI refactoring version 1.0