Fix unreacting end marker on first click and remove some labels that aren't supposed to be showing