Agenda fix part 2 WebView fixes