Bugg fix and restructure of the GuiDisplay class and some other stuff