Revert to rootscope for now
Initial
Update controllers
Fix display and saving of user info