Change layout to GridBag - #13