Merging UI changes from masters

Updated the labels for the display, history and memory