[APM] fix and tweak menu