Add views for civic info.
Merge branch 'civic-fixes' into develop