Cleaned up the header layout a little