Resolved UI conflicts