Improved control points and restored edge switching and missing lock icon.