fix bug & format dashboard