Text changes, add links for buttons
Solve merge conflict