add localStorage
minor fixes
Merge branch 'tabs' into dev

* tabs:
  minor fixes
  add localStorage