Bug fixes : Fixed points calculation and display issue