Please revert back to the original template window instead of the pop-up one. This update has complicated my grading, slowing it considerably by adding extra steps. It may not seem like a big deal...