Improved JS for Matrix fields