Storefront:  default_html5 template minor bug fixes