Added form/button templates and some functionality