Fixed AG markup.
AG correct template, reviewing and stuff.