Fixed various HTML issues, replaced remove button