added location state and city view and selector components