Added modified Buttonclass