JS fixes and a remove button.