ui: various minor fix