Removed a bunch of unnecessary button groups