change some button layouts and headers