Add functionality for "Close and Submit" option, this was previously the only behavior