Work on login screen
Started work on refactor of upload