UAT fixes
new Screenshots