Refactor some jsp files