restruct browser_view & various fixes