Edits to UI and Login code

Edits to UI to enable correct implementation of User class, as well as
re-edits of User class to work correctly with UI.
Adding Bryan's user login code
Merging back to head