Cleanup / Fixes for collapsible menu & map selection through hash