Make the current page visible when previewing
Fixed some more issues with names on non-anchor elements