Settings - Fixes storage, Adds Event Handlers