Updated to use grid()