Minor corrections to UI