- minor code cleanup
- finishing implementing button-as-dropdowns functionality