Added a client widget and generalized a lot of the new form templates