client ui element work - this commit closes issues #6 and #16
Merge remote-tracking branch 'origin/master'
client ui element work - this commit closes issues #6 and #16