Reorganize Element

(To fix a bug. Gotta be careful with tiny tag names like 'sub'!)