Fix bugs with new design and add some file, data provider still buggy