Done good progress on new layout.