Some ui fixes