Add form and template, update some other shit