MPG: Some more edits, fixed the margins issue