Merge issues

Removed the duplicate name field and cleaned up html a little.