Swing builder improvements