updated config to reflect updates to map widget
fix merge issues