Displaying improvements + attempt to handle misconnections