Added pugi XML files + Simplified the menu