Better perfs (print, button management)