Window doesn't close on cancel, cleaned up Controller