Need to fix dashboard page