converted more controls to be used as directive