595-10 More rework

Maybe the margins are correct?