Edit layout loading
Add optional rendering
Add optional layout rendering
Edit layout handling