merged admin & templates