Layouts instead of templates, closes #2