logic and ux updated