ui updates from alex
Merge branch 'master' of https://github.com/gsaito/SF28v4
fixed user account reference
Merge branch 'master' of https://github.com/gsaito/SF28v4