Fix links in masterhead, continue integration of new modal