Fix missing elemnt refdes' and update layout - now complete with elements.