Updated to new JSON format and button partial