Fix bug & Add dotted line