Changed the way forms are handled