Updated common class
Button functions work