added reset and initial styling
fixed merge fail