Matrix class ; GUI changes