+ some buttons renamed