Add a new container view to wrap the whole location selection

Add a new container view to wrap the whole location selection #4706