Started working on the data view window
Merged the new versions