Better admin menus
Better handling of non-automarked challenges