Comparison modal changes and other minor fixes