UIv3 polished