Made more improvements and added local storage