Updated to use SEO friendly URLs