Adding angular improvements & local storage