Removed old markup
Added mod_rewrite-based uris