Fix situation where callout can be obstructed

- Callout can be obstructed by previous controls, due to the way last
control is re-added as the subview