Fix/inf 12345 dashboard fix

Bug fixing it UP!