Code structure and documentation
Move hiding of upgrade page menu item to upgrade file