Bit more work on admin views, almost got basic admin views down