#FEC-1657 #time 2h #comment improved onPage logic and style