Major fixes of editbtncheck story.
Get done with the editbtn story