Rounded off login section, added factory & service