ui fixes, events fixes