updated helper methods and controllers
updated helper methods with login methods
fixed merge conflict