Add measure control. Fix group import. Close popups when selecting group.