improved rendering of code and labels