Edit layout view loading
Refactoring