Deleted odd layouts, refactoring