Simplify, re-use ui generated cls