Work on login
Imporved submit