last tests cleanup
some ui...