Fixes #47 changed name column
Fixes #49 added button