Changed the labels on the tabs and elements to better reflect meaning

I think these changes are purely to the display ... so should be easy to merge ...