some improvements & check icon