Changed table rendering order and added click refresh