admin and settings

from previous sab