Updated control code, added display class