More cleanup on the client side, implementing 'file' menu on GUI