Merge Fixes to the template and index.jsp