Adding some session storage stuff to improve user experience