Added some view controllers for forms pages and changed navigation buttons to say back
Merge remote-tracking branch 'origin'