[Admin] Few improvements