Made changes to the router and screen-two