Remove debugging output commands
Change Button constructors