FIX issues with collapsible menu