a few changes
render order