Finished separation of layouts and cleaning