Margin definitions updated + some minor edits