Revert "Tackle Issue #1 and #2"

This reverts commit 02dded73f6b4299ae6f6081f622a8635fb5d86a1.
Added collapsible menus back.
Brings back Issue #1 and #2