Improved admin tempaltes and user management