UX Fix: Grouping Stuff & Clear Buttons