Merging CSS changes and Encounter Search results reformatting