Update

Message window + Client window