button bar no longer draggable; map pans correctly with stats panel
fixed merge problems