cleanup, linking map and panels