Fixed some dashboard issues