Refactored UI