Added browse page
Merge conflict fix