Resolve #34: Refactor browsing