use new helpers and add refresh button