Added changes Jose made in his branch

I wasn't sure if I could merge the branches safely, so I added the
changes for the Data tab the old fashioned way.