bug 978868 - Integrate Webmaker Header
review fixes