Fix toggles and colspan calculation