Remove Display out of some classes and leave comments to replace for callbacks I dont know about the function of this code but it compiles :)
Fix small compiler errors in new interfaces