2.0 admin setup

Further tweaks on admin setup