html5 mode routing and minor changes