Added color icons nect to selectors
Now fits map to markers
Fixed merge conflict