Some intelligence added to UI