Reorganize fields so that they match to the BUCKeSmartphoneApp