Rework some UI for CCGV

partial attempt to #33