Redesign UI with GridBagLayout