User interface needs refinement

Other CIH issues: