Fixed issues matrix size and display