Bugs/ui

Fixes #1988 
And others bugs