User model separated and admin links further enhanced