Make effect buttons look nice (10 per row).
Support removal of effects from command map.