More work-in-progress on new layout