Refactor to single home jsp