added new window form and modified existing form