cleanup and buttons added