OrefPanel class Improvements