Fixed redirect issues for dashboard