Updates to behaviour of progress panel and points calculation