Adding units to fields. Closes #22, #23
Shortening side margins