Applied the solutions suggested by MagicDraw Customer Support, Layout isn't perfect yet but it looks better than before
Authored by: eziomacmanus 2016-06-29
Parent: [r108]
Child: [r110]
