Fixed issues with managing local storage, also saving option names in local storage