Adding OK button to welcome
Merging client