changed/removed various buttons