Some further work on layout and style.