header, front style changes
git merged