new key names for clever buttons modifications and unneded dict removed