2nd update start of adding buttons