Fixing alignment issues.
Merge remote-tracking branch 'origin/checkbook_edc' into checkbook_edc