Incorporates bugfixes on display of custom elements.