UI refactoring and UI improvement initial commit