Merge the missing changes to main.jsp and tab.js