UI part and plagin state fixes