Clean up modal window handling
Add cancel to GOC operation