* Changes to use gridBagLayout