Added toggle buttons to updateFields method