Communicator: layout fix