Controller changes. Fixed log in issues