added swing components and removed Device