Added storage for settings
fixed all tabs and removed some comments
Merge branch 'master' into issue1
Merged to avoid later conflicts