small ui fixes and cleanups