Started working on new layout.