Remove another BUG: delete hard coded div element

Change-Id: I2476efe7e8b577190c02d9a28eb31b12ae8e7484
Add more dcorator storage keys

Change-Id: Id83aab8a3531baf2732c1c451e9135d8cf2847df