Fixes: #1208, #1209 & reformatted typography field
Signed-off-by:KProvance <kevin.provance@gmail.com>