Working on buttons anf #64.
Fixed #66