Introduction of layout fields. Minor tweaks.