Updated with local storage

Remember the values for next app usage