Working on modal window
Merge branch 'Staging' of https://github.com/dordal/userballot into Staging