Fix broken UI from poor merge