Some ui fixes.