WebView source improved and bugfixies