Fixes to templates in Application.html and TestPage.html