Added refresh button and method + moved loading spinner