Fix the button names and the report