Refactor ol controls