Added some patches
Modular: Gui: small improvement