refactor browser handler
yo
revert back