Added Display Functions, CleanUp
Merge branch 'Exp_New_Display_Functions' into Dev
FH - Added New_Display_Functions and CleanUp