Fix to not override field settings in registry
Add support for implicit main_template based site layout and change to set no default site layout by default