Changed the template for rendering feedback to encorporate self feedback, and changed the handler to provide appropriate context