tweaked buttons and names