lots of changes for menu and multisite