Adding some changes on Xedit

Related with the new channel selector.