updated places controller and components
merge conflict