reorganized map tab and add group box to popup dialog