Renamed funcs/class
Added refresh button
moved dumb function back