Product item refactoring + user unaproved menu item fix