Major cleanup of the browse page