Fix related to #293
Added refresh button as a step toward #306
#287 #251