Fix #461 - Use margin rather than padding in container