Many ui fixes
Many ui fixes