Numerous changes to Display and View parts of the program