Added new form and window