Adding the comment message and fix minor design.