Refactor to single jsp