Fixed settings link, updated diffs