added expandable menu and fixed other button issues