Further progress on Swing UI