security fixes, and ui fixes