Updated for Access Point screen layout