More work on new layout.