#396 Reorganized rendering of different fields
#396 Removed code rendering