More AfterCaptureForm GUI fixes