Merge pull request #41 from jasich/master

Updates for Match
Fixed issues with user.  Made small UI updates