Improved the design at FileNameSwing