Templates updated to clean HTML whitespace.