Converted locations to Class Based Views
merging location class based view change