Dashboard fixes needed after testing with more data