Swing gui

merge