correction and buttons added