modified UI to accord to docs
merged with modification to meet with doc