Restructuring; Added X-Editable for Dynamic Editing