Moving to BorderLayout, no need to do a full GridBag