UI updates
Merge branch 'master' of https://github.com/dordal/userballot
fixed conflicts with merge
merge conflicts
removed missed elements in merge