Some fixes of UI