[Compiler] Code cleanup
[Client] Fixed rendering of upper level items