HOT FIX: revise buttons comment a favorite