cleaned up GUI, still working on client