Created a new form patterns and general improvements