Bug fix and widgets modularization.