changing buttons and minor changes