Tweak panel headers, remove unnecessary defaults