Repair UI, add some missing pieces

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
Change CU appearance

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
Support enumerators

Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>