Node focus display bug fixes