changed some buttons position
merged