Week of October 27th merge

I mostly did some UI changes. There username and password is in this pull request. Don't forget to merge with Jon's stuff before merging this otherwise there will be bad conflicts.