trying to fix login controls, and merge conflicts