Admin tweaks
Fix views(ish)