Mode Queue Updates

Added the display class to the mode queue to solve display issues.