Routing components bugfix

Various bugfixes made to Routing components