Improved text format, margin and padding