Fixed issues with user.  Made small UI updates