Upgrade validation of data and fix owerflow
add sort icon