Refine CND and Add ShowDetail comment feature