Fixed code blocks display

Core part (II) in v2.3