fix to some admin screens