added/changed some buttons