Many admin view fixes