Clean up initial router handling and add a default state

In case the current state is the default one we don't redirect.
This gets rid of the initial redirect/histroy entry when loading the page.