Add refresh button
Remove old code