Progress on layout and templating