Began refactoring the Compare Screen