Optimization
UI refactor