AI-499 : introduced widget container