added more filters, grouped buttons