CSS refactoring
more CSS refactoring.
TODO updated.
using storage events.