Don't pass extra arguments from map to Entity initializer
fixes #2465
Merge pull request #2467 from bhousel/localstorage-restore

Don't pass extra arguments from map to Entity initializer
Fix help pane button toggling (closes #2471)
(and cleanup code to make background, map_data, help panes more consistent)