UI Changes
Merge branch 'master' of https://github.com/dordal/userballot

Conflicts:
app/styles/treatments.css
UI Fixes