Start converting code to use GridLayout instead of relying on GridBagConstraints