changed a few file names, variables, made button group mixin