bla
Revert "bla"

This reverts commit 398dfe1189b99fabf5737fe2afd90039598c2881.
bla
Revert "bla"

This reverts commit ddb7d59a2851c26da3831d30c4d1a0cf4a47d80d.
Finally fixed the GUI rendering issue