Improve code organization
Add restore to defaults on long click