Minor changes, still need to pass Bundle from FormActivity to fields array