First fix for elements getting outside de svg element. Works but the feeling is not perfect
merged with master