Refactored UI addon