Code Cleanup

Beautified code and added new stuff to clientGUI
Merge remote-tracking branch 'origin/Derk'
Fix merge
Ingore fix