Mini fix
Build UI with Builder + Add class
Improve UI