Add fixes on buttons