Change names and captions
add Sum function
Rename Sum button
Merge branch 'refactor'
fixes after merge