Improved style, fixed bug so new data is fetched