All markup updated due to site speed suggestions.