Added dynamic primary comparator field

Fixed styling bits