Changed service names and web.xml so we can get to the index.jsp again, reverted style to show overrides in separate file.