Fix site layout to be optional
Add implicit main_template-based layout when default site layout is not set