Refactoring of the layouts somewhat complete!