Fix refresh on button clicks in TP2