Added cookiewarning and moved into context