Better handle overrides for UI