basic ui fixes