Admin ui fixes