Admin side loose ends tied