improved UI part