Major application changes

New form handling, new controllers