Added option to leave form open