Add clean up for data in storage service
Prepare zoom control
Prepare zoom control