Fixed layout of location selection

Fixed some UI weirdness for selection the location