FIX: correct UI state representation