various adjustments and next button replacement
Merge branch 'qflow' of https://github.com/opengovernment/opengovernment-app into qflow
Merge branch 'qflow' of https://github.com/opengovernment/opengovernment-app into qflow