Fix a few issues with admin menus