Improvement: better oneline ui