Make button class uniform

Closes #333