Minor improvements
Made menu collapsible