Layout related refactoring.