Remove old script names and duplicate constraints
Very minor change to code layout
fixed error traps on customers and branches as per Ricards report
Remove unnecessary html tags
Move header include tp after the bookmarks assignment