improved admin controller