Updated loop/if/with to be more consistent

The templates should now be more consistent, and a loop will always start with <% loop $Fields %> instead of <loop Fields %>.