refactored all views and controllers to reflect current user validations