Content part - finished  servlet and jsp refactoring