ui related client changes
fixed merge conflicts
added retry limit