Updated to use HTML5 routing