main.jsp cleanup, fixes #61