ui fixes + tests