14th Iteration

More fine tuning of User and Admin