PURE-204 Adapt the FeatureSelectBox -> follow widget structure
Added todo's