Reorganized UI so that collapsible buttons separate different use cases