fix header and change some stylin