Cleaning up the hunt tasks and the summary screen