Add comparator and buttons