Refactored UI structure