Assets & MenuManager Refactoring