Little more work in the GUI

Little more work in the GUI