Bug fixes + route toggle