separate menu and fix index
Merge branch 'master' of https://github.com/devhood/erp-blpi