cleanup code, add acp navi item create/update