Changed the constants and properties values for buttons