Changed headlines
recommit as didnt work
The Redesign
fixed conflicts