fixing plus adn minus but not done yet
merging buttonclass
 plus minus fix
merging