Swing UI improvements