Fixed the header sizes, and made some tweaks