eliminated page refreshes and fixed fetch