Ryan - added fields to buy back form, added data on devices controller