Combine layout.widgets with components.

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>