Fix and clean up browser