Resolved react router issues