Converted Display and Menu to objects