Add support for flow layout and combo , checkbox comnponents