Cvlfab 545 two part ui

fix cvlfab-582 and 583