fix several issues for dashboard