changed names, changed defaults, reverted button/menu behavior