add ordering options for elements & better code to move them