Need to get this out of there:
{if $main eq "catalog" and $current_category.category eq ""}
{else}
{include file="location.tpl"}
{/if}
That should be down in the body. FYI, there is a copy of all of your original templates in the skin_original directory
