Fixing field name and alignment