Removed commented-out code
Merged both display functions in PanelWrapper class