minor changes, renamed, rearranged buttons