Updated to new JSON format & remove button styles