Optimized formula and added table template in dashboard