removing unnecessary button class from lots of places