Moving to state-based routing
FINALLY this fixes the modal issue
More updates for state-based routing