Code Cleanup

Beautified code and added new stuff to clientGUI