Bugfix and reorder of elements