Working version
ui edits
user names added