merge header changes and into responsive branch