Half-done changes to CoreAdmin 2.0