Fix removal algorithm when start position is not at end
Add table markup