Add comparator functions
More styling