Small fixes of UI part.