Decouple dictionary.
Improve look and feel.