Change button class
Switching to internal storage wrapper
Switching to internal storage wrapper
Add settings
Add settings
Fix merge conflicts