Updated forms template