Remove ButtonCanvas; fix header/cookie viewer bugs