finished html and slight servlet changes