Added funding scope for city and started editing location views
Updated mose of the views
Merge branch 'master' into branch-r