Update GUI classes hierarchy and other fixes