Update UI according to josh suggestion.