buttons added and working