removed broken layouts and started a refactoring of layout handling.