correct header and more design tweaks