Reworked arrange module, <defs> always on top