Reorder ui to add directory list. Some fix to use new widget.