Minor bugfixes to the layout generation, content tracking options.