Add local storage and UI enhancement