Some small fixes on schemas
Fix modules menu order to fix duplucated bug