some ui fixes and bug fixes