some ui fixes, and match preference selector