Refactoring, fixes
LayoutLoader