fixed template issues in web app and wordpress