add with_points_count scope
use menu_controller
grand refac