Made retake button subview of editing toolbar.
Made retake overlay subview of editing toolbar.