Fixed refresh issues in UI and show more user friendly message when a conflict error occurs.