Progress with layout refactoring.