additional HTML5 template cleanups