Fix #153 and Improve pushState navigation