Further refactoring to the browserview