widgets reorg and simplification