- fixing router and route issue