Few ui fixes.