Output locations to HTML

Some tidying up