fixed UI conflicts