Further linking widget improvements.