Added display and plot number mapping and functionality