Fixed Performance Issues

When viewing the dashboard I had introduced some performance issues.
These should be fixed now