Removed a bunch of unnecessary button groups

Please wait for Reyjay to confirm before merging