UI polish in "main tuuli changes"