js controls improvements