Re-order access point settings and disable un-wired UI components
Merge