Fixes to polish ux