#535 Layout options: when saving template, also saving template options