ui fixes and driver fix