ui fixes & conflicts