merging
refactor header.jsp