Fixed routing and add HTML5 push state