added more logic to forward login resp to view
cleaned up
fixing merge conflicts