Fixed Servlet Mapping

Servlet Mapping was wrong, as was some redirects