Clean up and fixing the browse