Mattoo ui changes