Refactored UI components