fix linked contents tracking, layout cleanup
history tracking cleanup and refactor