Simplified structure. Added option to select new place by clicking on text label.