Conitnuing work on admin pages