Refactor apps reviewing and add menu count