added ids, cleaned up html