Cleanup, jshinting
Use cleaned of the control and add overlays as overlays to the control again