Fixed some mess in general button class
refs #989