Small changes to DOM ordering