Implemented public/city status views
Fixing merge conflict