Small fixes from UT
New UI